5f4f51af4849901ed0851bd868ffed888d31c9cb,java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java,JavaCompletionData,addKeywords,#CompletionVariant#,439

Before Change


    variant.addCompletion(PsiKeyword.WHILE, TailTypes.WHILE_LPARENTH);
    variant.addCompletion(PsiKeyword.DO, TailType.createSimpleTailType('{'));
    variant.addCompletion(PsiKeyword.FOR, TailTypes.FOR_LPARENTH);
    variant.addCompletion(PsiKeyword.IF, TailTypes.IF_LPARENTH);
    variant.addCompletion(PsiKeyword.TRY, TailType.createSimpleTailType('{'));
    variant.addCompletion(PsiKeyword.THROW, TailType.SPACE);
    variant.addCompletion(PsiKeyword.RETURN, TailType.NONE);
    variant.addCompletion(PsiKeyword.NEW, TailType.SPACE);
    variant.addCompletion(PsiKeyword.ASSERT, TailType.SPACE);
    variant.addCompletion(PsiKeyword.SYNCHRONIZED, TailTypes.SYNCHRONIZED_LPARENTH);
  }

  @Override

After Change



  private static void addStatementKeywords(CompletionResultSet variant, PsiElement position) {
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SWITCH), TailTypes.SWITCH_LPARENTH));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.WHILE), TailTypes.WHILE_LPARENTH));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DO), TailType.createSimpleTailType('{')));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.FOR), TailTypes.FOR_LPARENTH));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.IF), TailTypes.IF_LPARENTH));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.TRY), TailType.createSimpleTailType('{')));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.THROW), TailType.SPACE));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), TailType.SPACE));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.ASSERT), TailType.SPACE));
    variant.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.SYNCHRONIZED), TailTypes.SYNCHRONIZED_LPARENTH));

    TailType returnTail = getReturnTail(position);
    LookupElement ret = createKeyword(position, PsiKeyword.RETURN);
    if (returnTail != TailType.NONE) {
      ret = new OverrideableSpace(ret, returnTail);
    }
    variant.addElement(ret);
  }